cpufreq: don't re-init active dbs timer in S3 or cpu online
authorKeir Fraser <keir.fraser@citrix.com>
Fri, 26 Mar 2010 10:28:37 +0000 (10:28 +0000)
committerKeir Fraser <keir.fraser@citrix.com>
Fri, 26 Mar 2010 10:28:37 +0000 (10:28 +0000)
Signed-off-by: Wei Gang <gang.wei@intel.com>
xen/drivers/cpufreq/cpufreq_ondemand.c

index d4d43f4a34adb22d27ed0a535a7df5fbf5dbb932..5728a8fbaff7257a7cabb06d78bb01a1ad183e3e 100644 (file)
@@ -196,8 +196,9 @@ static void dbs_timer_init(struct cpu_dbs_info_s *dbs_info)
 {
     dbs_info->enable = 1;
 
-    init_timer(&dbs_timer[dbs_info->cpu], do_dbs_timer, 
-        (void *)dbs_info, dbs_info->cpu);
+    if ( !dbs_timer[dbs_info->cpu].function )
+        init_timer(&dbs_timer[dbs_info->cpu], do_dbs_timer, 
+            (void *)dbs_info, dbs_info->cpu);
 
     set_timer(&dbs_timer[dbs_info->cpu], NOW()+dbs_tuners_ins.sampling_rate);